bitkeeper revision 1.1159.224.5 (41f14ef5rOG9bCYLcvdZA7IP1BEjng)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 21 Jan 2005 18:50:29 +0000 (18:50 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 21 Jan 2005 18:50:29 +0000 (18:50 +0000)
commit91e7a3c674aca2fbd04b6f92d913d94d252ed7e5
treef214fca7b5eea7dbbfb9cdc083680de7c925145d
parent27ae37054b70b3e6b668ee2b99c98a9e45366aa5
parent2f32a8085286aaed3d81c5ca17bb6cad9a2a32a7
bitkeeper revision 1.1159.224.5 (41f14ef5rOG9bCYLcvdZA7IP1BEjng)

manual merge
xen/arch/x86/dom0_ops.c
xen/arch/x86/domain.c
xen/common/Makefile
xen/common/dom0_ops.c
xen/common/domain.c
xen/common/keyhandler.c
xen/drivers/char/console.c
xen/include/asm-x86/mm.h
xen/include/public/arch-x86_32.h
xen/include/public/xen.h
xen/include/xen/domain.h